From 323b2261c124166a7551a2f18387bf0d493f793c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roger=20Pau=20Monn=C3=A9?= Date: Thu, 10 Dec 2015 13:16:15 +0100 Subject: [PATCH] x86/hvm: loosen up the ASSERT in hvm_cr4_guest_reserved_bits and hvm_efer_valid MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Loosen up the condition so we make sure that the current vcpu belongs to the same domain. Signed-off-by: Roger Pau Monné Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/hvm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index af3d4d77fe..92d57ff918 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1842,7 +1842,7 @@ static const char * hvm_efer_valid(const struct vcpu *v, uint64_t value, { unsigned int level; - ASSERT(v == current); + ASSERT(v->domain == current->domain); hvm_cpuid(0x80000000, &level, NULL, NULL, NULL); if ( level >= 0x80000001 ) { @@ -1912,7 +1912,7 @@ static unsigned long hvm_cr4_guest_reserved_bits(const struct vcpu *v, { unsigned int level; - ASSERT(v == current); + ASSERT(v->domain == current->domain); hvm_cpuid(0, &level, NULL, NULL, NULL); if ( level >= 1 ) hvm_cpuid(1, NULL, NULL, &leaf1_ecx, &leaf1_edx); -- 2.30.2